gtkbuilder: Do not allocate colors when parsing GtkBuilder files
authorBenjamin Otte <otte@redhat.com>
Sat, 31 Jul 2010 10:00:45 +0000 (12:00 +0200)
committerBenjamin Otte <otte@redhat.com>
Tue, 10 Aug 2010 19:02:30 +0000 (21:02 +0200)
gtk/gtkbuilder.c

index c8918b4d13a8bf7bb8f9e5ccf437a5e52d952067..cad61d36ac8f029752ff20d4dc2bf0ef9b6297f5 100644 (file)
@@ -1545,12 +1545,10 @@ gtk_builder_value_from_string_type (GtkBuilder   *builder,
     case G_TYPE_BOXED:
       if (G_VALUE_HOLDS (value, GDK_TYPE_COLOR))
         {
-          GdkColor colour = { 0, };
+          GdkColor color = { 0, };
 
-          if (gdk_color_parse (string, &colour) &&
-              gdk_colormap_alloc_color (gtk_widget_get_default_colormap (),
-                                        &colour, FALSE, TRUE))
-            g_value_set_boxed (value, &colour);
+          if (gdk_color_parse (string, &color))
+            g_value_set_boxed (value, &color);
           else
             {
              g_set_error (error,